Fixed some organization in files and directories