Stripped unneeded files/features and moved common to root directory.