remove outcommented method
sorted source files
structure changed