Changed project to use subdirs structure.
Added test subproject.