Moved to a new projects structure
Added generic test