Improved build structure; prepared for CI