Changing file structure to better represent ImpactJS