Moved files around for S3, fixed css.