CLEANUP: merged src folders

*fixed typos
*moved devloper code to its own file