Added proper require, and moved into correct subdirectories