Changed file structure to a modular approach