new file structure, makes more sense now