Extensified project structure
Updated module