New file structure to clean things up. New program will be structured like a python package