Fix bug and move to "src" folder