Removed Classes/libs and migrate all changes to libs