Refactoring folder structure

Made the folder structure a little easier to understand.