Moved modules to 'custom' directory, fixed bugs