Organized

Better file structure