more organization of files and settings, just moving code around