Restructure directories to be Maven-friendly