Update dir structure, removed redundant files