Files restructure. Closes #4