a little better now with all the stuff in different directories, easier to manage