re-initial commit with... better folder layout