Changed directories
Removed pinkyard support