Putting things into subdirectory
Putting plugins back in.
Powerline working again