cleaned up code
renamed files for consistency