some changes in the file organization
moved files