Cleaning up folder structure. Updated ServiceStack packages.