Unify script/style dirs
More logical file names