Refactoring of source directory structure
Fixed issue #3. Partial fix for issue #2 (module-context.xml not being updates however).