Change dirs structure; Update build file