Changed some file. Pending restructure