diff --git a/src/lib.rs b/src/lib.rs
index 8aede1c..033ae80 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,7 +17,7 @@ mod subjects;
 mod substitutions;
 mod teaching;
 mod timetable;
-mod user; //TODOS
+mod user;
 //webmodules
 //predictor
 
diff --git a/src/timetable/endpoints.rs b/src/timetable/endpoints.rs
new file mode 100644
index 0000000..6c2cb44
--- /dev/null
+++ b/src/timetable/endpoints.rs
@@ -0,0 +1,29 @@
+use std::marker::PhantomData;
+
+use crate::{Endpoint, Timetable};
+
+pub const PERNAMENT_TIMETABLE_ENDPOINT: Endpoint<Timetable, ()> = Endpoint::Get {
+    url: "/api/3/timetable/permanent",
+    auth: true,
+    _types: PhantomData,
+};
+
+pub const PERNAMENT_TIMETABLE_CLASS_ENDPOINT: Endpoint<Timetable, ()> = Endpoint::Get {
+    url: "/api/3/timetable/permanent/class/{classId}",
+    auth: true,
+    _types: PhantomData,
+};
+
+
+pub const WEEK_TIMETABLE_ENDPOINT: Endpoint<Timetable, ()> = Endpoint::Get {
+    url: "/api/3/timetable/actual",
+    auth: true,
+    _types: PhantomData,
+};
+
+
+pub const WEEK_TIMETABLE_CLASS_ENDPOINT: Endpoint<Timetable, ()> = Endpoint::Get {
+    url: "/api/3/timetable/actual/class/{classId}",
+    auth: true,
+    _types: PhantomData,
+};
diff --git a/src/timetable/mod.rs b/src/timetable/mod.rs
new file mode 100644
index 0000000..151e3d2
--- /dev/null
+++ b/src/timetable/mod.rs
@@ -0,0 +1,5 @@
+mod timetable;
+mod endpoints;
+
+pub use timetable::*;
+pub use endpoints::*;
\ No newline at end of file
diff --git a/src/timetable.rs b/src/timetable/timetable.rs
similarity index 100%
rename from src/timetable.rs
rename to src/timetable/timetable.rs