added missing functions and better structure, not finished
reorganisation, added missing functions
Merge pull request #138 from astroidex/master

reorganisation, added missing functions, reparate block for every category