reorganised + cleaned git repo