Removed and renamed files

Partially fixes issue 11