1) Moved some dirs
2) Began implementing second part