More skeleton code; Refactored package names
Ran cleanup and format for all source