Converted to maven project and restructured to war project structure