Change dir structure, added docs