Reorganized directories in order to fix circulat dependencies, renamed files andirectories