Update maven project build + project resource restructuring