Moved main project to a sub directory
Added UT