Organized code into correct files