Cleaned up dir structure and naming; made into gem