Cleaned up File Structure/Includes