organize classes into better folder structure