Reorgainizing folder structure and updating files to be more modular.