reorganize how files are required + class fixed