Changed folders to support maven