Refactoring
Improved build file
New foundry version added
Fixed issues