Moved images into folder, merged CSS