Refactoring

Refactoring is done. Erased some files and codes from src files.