Revert "Moved stuff to include folder"

This reverts commit 32dcd7c00351a8e53aadc08958696c065730ea77.
Revert "Tried moving to seperate file"

This reverts commit acbd7c081340162dc6b4b81597bc09a67c85b1b1.