File naming conventions, removed unused files.