REmoved innecessary folders
Clean up Maven modules