Creating proper modules
Removing old models