Reorganized and filtered files

Hey I actually did it.