Removed library and port to base project
Minor fixes for new software arch