Major refactor for package naming convention (Starting to think of modules).