Cleaned up package and file structure