Moved to dir structure as per #5