Fixed up folder structure to make things more modular