Moved source to a folder.
Fixed the errors introduced by 1.5 mc update.
Fixed the errors introduced by 1.5.1 mc update.