Cleaned up folder structure
Updated to use Google Analytics Universal