Cleaned up files and includes