renamed modules and refactored into Maven format