more logical seperation of files