What does a bored day gives you?

Fixes! You were correct!
Gradelize!
Moved everything into the proper structure