#misc cleaned up project to use proper naming schema.