completely reworked dir structure; much cleaner