cleaned up the folder layout a little bit