cleaned up naming and removed default files