Changed directory structure

Remember to test this out! This would make the project more organized
and easier to scale.