Cleaned up file names and includes