Beta v1.0

Move the code to right class