Move some files around; Fix code; IDEA project update