reorganize sass files and consolidate variables