Moved Start.java into its own package.
Moved things around