fix warnings
Use recommended project layout