Annotation done; added modifiers; moved IO; JUnit