renamed some files and better organization