Removed Creates.class
Moved the creates to the right classes