CLEANUP: merged src folders

*fixed typos