Move data to own directory.
Fix for factory self call. Removed footer top margin.