Moving some classes into another locations
Added the documentation