Organize directives and models, this is ready for make users module and more