Cleaned up files. Removed unused files and renamed others to fit the
current naming convention.