Moved extras into folder