Remove unnecessary folder
Re-factory the code