reworked directory structure, should be alot clearer now