Fix file structure to allow testing from all IDE