Fix project organization