Moved main files into their own packages