moving files around to better suit the flow of the program
updated the package hierarchy