rename files and restructure project