Compilation bugfix
Simpler port folder structure
New tests