Made the folder/file structure modular