Sorted into Packages. Finished the main setup for the client