Starting on PSD conversion, organized PSD

Started on basic markup. Cleaned up PSD.