restructured the files to match the gradle default structure