changing to more standard file structure