Restructure

Made directory structure / install cleaner