Restructured layout + Java EE comformance and deployment fixes