Added links, cleaned up dir structure