Finish improve comment
Move classes to proper folder
Start functions, improve comment, improve debug