Organizing directories and porblem 2 (first commit)