Final preparation for beta testing.
- Moved Images to proper location.
- Fixed a few bugs