Improved some comments
updated
Moved files to subfolders