Heavy Code Revision

Heavily recoded some aspect - custom post types used now, and better importing.